Methods For Resolving Conflicts